merge emacs-23

diff --cc src/ChangeLog
index d50d3e61bc0269f3fe63208d66f9106a283dc2dd,6cbc624e9148f8b242bb95edb0657b741c3158c8..95c702fecd379ae40bd26867f938bf979fc73022
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2011-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +      * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
 +
 +      * xftfont.c (xftfont_open): Likewise.
 +
+ 2011-02-01  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * window.c (Fselect_window): Add missing return value.
+ 
  2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
  
        * image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead